From 4ca6f9f0377a30755a299cc60a6d44ab6c3b34d0 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Wed, 11 Dec 2013 10:30:02 +0100 Subject: [PATCH] x86/cpuidle: publish new states only after fully initializing them Since state information coming from Dom0 can arrive at any time, on any CPU, we ought to make sure that a new state is fully initialized before the target CPU might be using it. Once touching that code, also do minor cleanup: A missing (but benign) "break" and some white space adjustments. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Liu Jinsong --- xen/arch/x86/acpi/cpu_idle.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 9313285e71..597befa387 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -912,7 +912,7 @@ static void set_cx( acpi_power->cpu, xen_cx->type); return; } - cx = &acpi_power->states[acpi_power->count++]; + cx = &acpi_power->states[acpi_power->count]; cx->type = xen_cx->type; break; } @@ -937,11 +937,14 @@ static void set_cx( break; default: cx->entry_method = ACPI_CSTATE_EM_NONE; + break; } - cx->latency = xen_cx->latency; - + cx->latency = xen_cx->latency; cx->target_residency = cx->latency * latency_factor; + + smp_wmb(); + acpi_power->count++; if ( cx->type == ACPI_STATE_C1 || cx->type == ACPI_STATE_C2 ) acpi_power->safe_state = cx; } -- 2.30.2